more database fixes. Sort of works but need to correct 'after', and other options
Album viewer uses database. Looks like it works(!)
Album viewer uses database. looks like it works