seperating single vs full album queries on home page and some code maintenance