Fixes with sorting defenitions + showing source in details