Fix on checkboxes
Query optimisations