Updating query
Updating add/edit form height
Merge remote-tracking branch 'origin/production'