fix AND and add ability to pass AsIs text instead of column names