[ADD] simple AND operation on query ... needs to be expanded