Merge "Fix at end navigation condition for query pages"