added RIVER implementation for all entities
removed 'hardcode'
updated search