OGDCH-142: Add query value to form when changing sort order