fixes in index and resource controller