Fixing starts_with optimizer