You might want to bite the bullet now and get rid of those Dictionaries, note that CR 10 no longer supports them, and they were never a preferred method.
If it's an option, creating Views or SPs on the database allows for reusability and simplified maintenance
-k