minor improvements
don't poll the database if we can just execute the modifier directly