Added ifs to have crude catch-all for filter limits.