Many-to-many index with multiple arguments replaced with two indexes?