Index/join improvements: added second join column