Fixed issues in collections.options due to refactoring