icons for sorted columns added, is_map? fixed, refactoring