Vid 313 - File page performance fixes