Add possibility to filter for custom tags