HHH-8884 : Made this only remove "and " and " and"

Made this only remove "and " and " and" as otherwise tables named "android" end up being queried as "roid".