Fix include_entities to include_user_entities where appropriate. closes #4