[fix] do not use internal helper classes for selector contruction