Reworked a bit of Bulk Actions for search as per Issue #626