remove EntitySelector, use PropertySelector