Switched back to Collections and improve standards tagging

Remove Smart Collections