Check for type annotation

Check if a type is set, and only use EntitySelect if not