Filter watches in admin, fix shortDescription