Bug fixes for custom also and or statements