Made the selector hack configurable