CORE-5904: Light refactoring
CORE-5904: Converted anonymous callback to inner class
CORE-5904: Class cleanup
CORE-5904: Added before load handler to protect against loading results that do not correspond to the currently selected folder
CORE-5904: Class cleanup
CORE-5904: Corrected unit test error