Improve selector RegExp