Fixed a few issues with views asking for data but not finding any