Bug fixes - query page, validations