changing dependencies acourding to the default derby app. plus moving from filters to queries