Added queries and filters