Splitting up combined indices for primary and foreign keys to use simple single column indices