Cleaner Json parser & Add album query