Fixing History Related View dependency