Revert hash structure to work with admin view. TODO: hadnle this properly