Fixed query for markup