grilo: rework add and remove clauses for content rescan