Added queries to match filtering
fixed type filter on indexes
moved filtering to sidebar