Added ability to handle boolean functions contains and starts_with