Fixed query and styling