updates to regexes to handle job_types better

fixes based on misses with jeads' regex miss tests.