With query added for extra viz