Added single attribute match query builder and test