Improve selector hacks support