Move index request for inclusions into DB manager
Fixed minor lint issues