Updating regex to remove spaces
Tweaked SQL for lower statements