#1203 - temporary solution to show dataset as indicator until we have the flag to distinguish between them
#1203 - refactoring controller to the right extension