Branch: development_settings
History listing, Schdule listing related query change and search related changes