swapped query and angular