Filter placeholder and pass type to relationship options getter

Conflicts:
	system/cms/modules/streams_core/field_types/choice/src/Pyro/FieldType/Choice.php