Refactoring tags list and custom data retrieval