Fix undefined $entity_type variable
Remove undefined variables in oa_core_get_space_type_layout_options