Extending the SQL select regex + space tweak