Cleaned code + url search in admin