Changes related to the bug #42 - Still working on it
Inner join related bugs fixed