added new objects for testing content definition filters + some small fixes