adapted final exercise to dynamic queries content